Update Xen version to 4.1.0-rc4

diff --git a/Config.mk b/Config.mk
index b2056daa11c64d95bb37176f0b5bb9e78a3ca9fb..bd70f244c604d43975759012702cdebe5181c3ed 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -185,7 +185,8 @@ endif
 # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
 CONFIG_QEMU ?= $(QEMU_REMOTE)
 
-QEMU_TAG ?= ad7d28519de7cdc604efefac5c22fe9f88040586
+QEMU_TAG := xen-4.1.0-rc4
+#QEMU_TAG ?= ad7d28519de7cdc604efefac5c22fe9f88040586
 # Tue Feb 1 17:32:38 2011 +0000
 # vnc, xen: write vnc address and password to xenstore
 

diff --git a/xen/Makefile b/xen/Makefile
index e69ba439f55218f258de935cf4a16f8e1afc64ec..7c4eaddc48d98dc91401716e573339d2993868f4 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -2,7 +2,7 @@
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
 export XEN_SUBVERSION    = 1
-export XEN_EXTRAVERSION ?= .0-rc4-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc4$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version